Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sun, 14 Oct 2012 08:03:16 +0000 (10:03 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sun, 14 Oct 2012 08:03:16 +0000 (10:03 +0200)
commit0e8b46f589bbeea29d60903d34e7d1ed0a24e339
treef14ff39e1c5de419b152f263b92c3d9d8369807b
parentd41903dc80dbf840b2683e0347ccbc1ae845ba83
parent5b0f077f67cb69180b80a73f8d4d68f9cb2c5ab8
Merge from trunk.
lisp/ChangeLog
src/ChangeLog
src/lisp.h
src/makefile.w32-in
src/w32fns.c
src/w32inevt.c